From: Juri Linkov <juri@jurta.org>
Date: Thu, 12 Feb 2009 21:49:29 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~1827
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=a0a1bd395b0e72386372b51fc30691346f7237dd;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 02de0117f88..5c8c4d29206 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2009-02-12  Juri Linkov  <juri@jurta.org>
+
+	* image-mode.el (image-toggle-display):
+	Let-bind `buffer-file-truename' to nil around the call to
+	`add-text-properties' to prevent directory time modification
+	by lock_file.  Replace `set-buffer-modified-p' with
+	`restore-buffer-modified-p'.  (Bug#2295)
+
 2009-02-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* progmodes/python.el (python-use-skeletons): Re-add.